meta 0.0.1 → 0.0.3

data/Gemfile.lock

@@ -1,7 +1,18 @@
 PATH
   remote: .
   specs:
-    meta (0.0.1)
+    meta (0.0.3)
+      colorize (~> 0.6.0)
+      haml (~> 4.0.4)
+      highline (~> 1.6.20)
+      rack (~> 1.5.2)
+      redcarpet (~> 3.0.0)
+      sequel (~> 4.5.0)
+      sqlite3 (~> 1.3.8)
+      thin (~> 1.6.1)
+      thor (~> 0.18.1)
+      tilt (~> 2.0.0)
+      url2thumb
 
 GEM
   remote: https://rubygems.org/
@@ -23,6 +34,7 @@ GEM
       rack (>= 1.0.0)
     thor (0.18.1)
     tilt (2.0.0)
+    url2thumb (0.0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -8,7 +8,8 @@ be used to test/preview static pages in your development environment without
 having to deploy into production.
 
 ## requirements
-* ruby 1.9.2+
+* linux (tested on ubuntu 12.04.x lts)
+* ruby (1.9.2+)
 * bundler
 * colorize
 * haml
@@ -20,6 +21,8 @@ having to deploy into production.
 * thin
 * thor
 * tilt
+* url2thumb
+* yaml
 
 ## installation
 ```gem install meta```

data/docs/backlog

@@ -1,12 +1,16 @@
 open:
-+ migrate schema without losing any data
-+ multiple templates
-+ syntax highlighting for code
-+ title modification
++ custom templates
 + referencing a link and commenting on that
++ post tags
++ rss/atom feed
++ config file based configuration
++ pull content from other sinks like facebook, flickr, twitter, wechat, etc
++ links
 
 iced:
++ syntax highlighting for code
 + support uppercase file extensions
++ migrate schema without losing any data
 + detect and compile changes only
 + tie static files with source repository
 + clone template files
@@ -24,3 +28,6 @@ closed:
 + single entry template
 + add config.ru file for testing, this should be added during compilation
 + google analytics
++ title modification
++ statistics
+

data/docs/design

@@ -9,15 +9,12 @@ design:
 directory layout example:
    
 + src
-+-- site.db
++-- site.sqlite3
 +-- article1.md
 +-- article2.md
 +-- layout.haml
 +-- navbar.haml
 +-- footer.haml
-+-- css
-+-- images
-+-- js
 
 * create a flat hierarchy of html files
 * js, css, images are found in folders
@@ -37,3 +34,72 @@ articles( id, creation, modification, title, layout, src )
   b.  organize by latest at the top
 4.  create individual pages
 
+in the initial version, layout.haml, navbar.haml were fixed templates.  this
+assumes that each site will have these files.  there can actually be multiple
+layouts for a site so there needs to be a mapping of layouts to content (md
+files).  also there should be enough flexibility to not have navbars, or
+multiple navbars, etc.
+
+there will be 4 main types of haml templates: page layouts, navbars, footers,
+and contents.
+
+layout files are the main templates that house the structure of the site,
+from enclosing html tags to the head which includes all of the stylesheets
+and javascript assets.  in order to identify layout files, the filename will
+be searched for the substring "layout.haml".
+
+e.g.
+
+layout.haml
+main.layout.haml
+sub-layout.haml
+layout-sub.haml (not valid)
+
+each of these will be listed in the layouts table
+
+navbars are embedded in layout templates and need to have the "navbar.haml"
+identifier in the filename.
+
+footers are also embedded in layout templates and need to have the
+"footer.haml" identifier in the filename.
+
+content templates are also embedded in layout templates and need to have the
+"content.haml" identifier in the filename.
+
+if there's only one set of navbars, footer, and layout, then the user
+won't be prompted.
+
+the above is for a more advanced version, let's keep things simple, you
+must have layout.haml, index.haml, and page.haml.
+
+1.  layout.haml defines the overall site from html tags to body and head.
+meta requires this file be present in order to compile.
+
+2.  index.haml includes the content for the main page of a site, typically
+it's a summary of all posts.
+
+3.  page.haml includes the content for a single post.
+
+let's initially support the case where layout.haml, index.haml, and page.haml
+are required.
+
+custom templates:
+
+assume a site has pages for about, projects, etc.  there should be a generic
+way to associate a layout and content layer, and the process should be very
+simple.
+
+assume there are these types of posts:
+
+1.  blog:  mostly original text from an author, can contain pictures, tables,
+etc.
+2.  picture:  picture only post, no text.  will include pictures from other
+sources only, will not store many pictures on my site.
+3.  recommended link: user submit's url, title, summary, maybe a picture
+included.
+
+
+markdown compendium:
+
+[![alt text](image link)](web link)
+

data/lib/meta.rb

@@ -4,11 +4,13 @@ require "colorize"
 require "digest/md5"
 require "haml"
 require "highline/import"
+require "open3"
 require "redcarpet"
 require "sequel"
 require "sqlite3"
 require "thor"
 require "tilt"
+require "yaml"
 
 require File.join( File.dirname(__FILE__), "meta", "catalog" )
 require File.join( File.dirname(__FILE__), "meta", "cli" )
@@ -24,17 +26,21 @@ end
 module Meta
 
   BASEDIR         = ".".freeze
+  CONFIGFILE      = "~/.meta".freeze
   DATASTORE       = File.join( Dir.pwd, "site.sqlite3" )
   EXCLUDES        = [ "layout.haml", "navbar.haml", "footer.haml" ]
+  FEXISTS         = "File already exists".freeze
   HAML            = ["*.haml"]
   HAMLEXT         = ".haml".freeze
   HTML            = ["*.html"]
   HTMLEXT         = ".html".freeze
   INDEX           = "index.html".freeze
   MARKDOWN        = ["*.md", "*.markdown", "*.mkd"]
-  MARKDOWNEXT     = ".md".freeze
+  MDEXT           = ".md".freeze
+  PNGEXT          = ".png".freeze
   SEED            = 1234562
   SLASH           = "/".freeze
+  SPACE           = " ".freeze
 
 end
 

data/lib/meta/catalog.rb

@@ -10,6 +10,17 @@ module Meta
       
     end
 
+    def get_statistics
+
+      stats = Hash.new
+
+      stats[:posts]       = self.db[:contents].count
+      stats[:pictures]    = self.db[:contents].where(:picture => true).count
+
+      return stats
+
+    end
+
     def content_exists?(file)
 
       rs = self.db[:contents].where(:path => file).all
@@ -75,7 +86,7 @@ module Meta
         :title => title,
         :hash => hash,
         :path => file,
-        :created_at => File.ctime(file) )
+        :created_at => Time.now )
 
     end
 

data/lib/meta/cli.rb

@@ -3,6 +3,8 @@ module Meta
   class CLI < Thor
     include Thor::Actions
 
+    config = YAML.load_file(CONFIGFILE) if File.exists?(CONFIGFILE)
+
     desc "compile", "compile meta files" 
     method_option :output, :aliases => "-o", :type => :string,
       :required => false, :desc => "static file output directory"
@@ -21,7 +23,7 @@ module Meta
       p = Meta::Page.new(dest)
 
       p.generate(options[:force])
-      p.generate_main(options[:force])
+      p.generate_index(options[:force])
 
     end
 
@@ -96,11 +98,48 @@ module Meta
 
     end
 
+    desc "capture", "capture thumbnail of url"
+    method_option :output, :aliases => "-o", :type => :string,
+      :required => false, :desc => "output directory"
+    def capture(url)
+
+      if options[:output].nil?
+        dest = BASEDIR
+      else
+        dest = options[:output]
+      end
+
+      images  = dest + SLASH + "images"
+
+      images  = dest unless Dir.exists?(images)
+
+      cmd     = "xvfb-run url2thumb capture #{url} -o #{images}"
+
+      stdin, stdout, stderr = Open3.popen3(cmd)
+
+      abort( stderr.read.chomp.red ) if stdout.nil?
+
+      out = stdout.read.chomp
+
+      unless out.include?(FEXISTS)
+
+        created = out.split(SPACE).first
+
+        link = "[![referral](images/#{File.basename(created)})](#{url})"
+
+        Meta::Filelib.create_file( link, created, MDEXT, dest, false )
+
+      end
+      
+    end
+
     desc "test", "testing"
     def test
 
-      p = Meta::Page.new
-      p.generate_main
+      c = Meta::Catalog.new
+      stats = c.get_statistics
+      puts stats[:posts]
+      puts stats[:pictures]
  
     end
 

data/lib/meta/filelib.rb

@@ -17,9 +17,9 @@ module Meta
 
     end
 
-    def self.create_file( text, filename, dest, overwrite=false )
+    def self.create_file( text, filename, ext, dest, overwrite=false )
 
-      filename = File.basename( filename, File.extname(filename) ) + HTMLEXT
+      filename = File.basename( filename, File.extname(filename) ) + ext
       filename = dest + SLASH + filename
 
       reply   = false

data/lib/meta/page.rb

@@ -2,88 +2,39 @@ module Meta
 
   class Page
 
-    attr_reader :layout, :navbar, :catalog
+    attr_reader :catalog
 
     def initialize(dest=BASEDIR)
 
-      @dest     = dest
+      @dest       = dest
 
-      @catalog  = Meta::Catalog.new
+      @catalog    = Meta::Catalog.new
 
-      @layout = Tilt.new("layout.haml")
-      @navbar = Tilt.new("navbar.haml")
-      @col    = Tilt.new("col.haml")
+      @templates  = Meta::Filelib.get_templates
 
-    end
-
-    def generate_row(contents)
-
-      length = contents.length
-
-      if length == 1
-        contents[0][:col_classes] = "col-lg-12 box"
-      elsif length == 2
-
-        rng = Random.new(SEED)
-
-        r = rng.rand(1..3)
+      @layout = Tilt.new("layout.haml") if @templates.include?("layout.haml")
+      @navbar = Tilt.new("navbar.haml") if @templates.include?("navbar.haml")
+      @index  = Tilt.new("index.haml")  if @templates.include?("index.haml")
+      @page   = Tilt.new("page.haml")   if @templates.include?("page.haml")
 
-        if r == 3
-          contents[0][:col_classes] = "col-lg-6 box"
-          contents[1][:col_classes] = "col-lg-6 box"
-        elsif r == 2
-          contents[0][:col_classes] = "col-lg-8 box"
-          contents[1][:col_classes] = "col-lg-4 box"
-        else
-          contents[0][:col_classes] = "col-lg-4 box"
-          contents[1][:col_classes] = "col-lg-8 box"
-        end
-
-      elsif length == 3
-        contents[0][:col_classes] = "col-lg-4 box"
-        contents[1][:col_classes] = "col-lg-4 box"
-        contents[2][:col_classes] = "col-lg-4 box"
-      else
-        contents[0][:col_classes] = "col-lg-3 box"
-        contents[1][:col_classes] = "col-lg-3 box"
-        contents[2][:col_classes] = "col-lg-3 box"
-        contents[3][:col_classes] = "col-lg-3 box"
+      if @layout.nil?
+        abort("layout.haml template missing, this file must be included".red)
       end
-
-      return contents
+      #TODO: must include index and page as well
 
     end
 
-    def generate_main(overwrite=false)
-
-      c = @catalog.get_recent(-1)
-
-      length = c.length
-      remain = length
-      index  = 0
+    def generate_index(overwrite=false)
 
-      rows = []
+      contents = @catalog.get_recent(-1)
 
-      rng = Random.new(SEED)
+      stats    = @catalog.get_statistics
 
-      while remain != 0 do
+      doc   = @index.render( self, :contents => contents )
 
-        n = rng.rand(1..remain)
+      html  = @layout.render( self, :stats => stats ) { doc }
 
-        r = generate_row(c[index..index+n-1])
-
-        remain = remain - n
-        index  = index + n
-
-        rows << r
-        
-      end
-
-      doc   = @col.render( self, :rows => rows )
-
-      html  = @layout.render { doc }
-
-      Meta::Filelib.create_file( html, INDEX, @dest, overwrite )
+      Meta::Filelib.create_file( html, INDEX, HTMLEXT, @dest, overwrite )
 
     end
 
@@ -91,6 +42,8 @@ module Meta
 
       all = Meta::Filelib.get_contents
 
+      stats   = @catalog.get_statistics
+
       all.each do |c|
 
         if File.zero?(c)
@@ -102,22 +55,15 @@ module Meta
 
         content = @catalog.check_content(c)
 
-        content[:col_classes] = "col-lg-12 box"
         content[:summary]     = Tilt.new(c).render
         content[:link]        = File.basename( content[:path],
           File.extname(content[:path]) ) + HTMLEXT
 
-        contents = []
-        contents << content
-
-        rows = []
-        rows << contents
-
-        r = @col.render( self, :rows => rows )
+        p = @page.render( self, :content => content )
 
-        html = @layout.render { r }
+        html = @layout.render( self, :stats => stats ) { p }
         
-        Meta::Filelib.create_file( html, c, @dest, overwrite )
+        Meta::Filelib.create_file( html, c, HTMLEXT, @dest, overwrite )
 
       end
 

data/lib/meta/version.rb

@@ -1,4 +1,4 @@
 module Meta
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end
 

data/meta.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |spec|
   spec.version       = Meta::VERSION
   spec.authors       = ["stephenhu"]
   spec.email         = ["epynonymous@outlook.com"]
-  spec.description   = %q{meta language compiler for static web pages }
-  spec.summary       = %q{meta compiler (meta)}
+  spec.description   = %q{opinionated static web page generator}
+  spec.summary       = %q{opinionated static web page generator}
   spec.homepage      = "http://github.io/stephenhu/meta"
   spec.license       = "MIT"
 
@@ -19,7 +19,20 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.bindir        = "bin"
 
+  spec.add_dependency "colorize", "~>0.6.0"
+  spec.add_dependency "haml", "~>4.0.4"
+  spec.add_dependency "highline", "~>1.6.20"
+  spec.add_dependency "rack", "~>1.5.2"
+  spec.add_dependency "redcarpet", "~>3.0.0"
+  spec.add_dependency "sequel", "~>4.5.0"
+  spec.add_dependency "sqlite3", "~>1.3.8"
+  spec.add_dependency "thin", "~>1.6.1"
+  spec.add_dependency "thor", "~>0.18.1"
+  spec.add_dependency "tilt", "~>2.0.0"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+
+  spec.add_runtime_dependency "url2thumb"
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,168 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-30 00:00:00.000000000 Z
+date: 2014-01-11 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.4
+- !ruby/object:Gem::Dependency
+  name: highline
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.20
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.20
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+- !ruby/object:Gem::Dependency
+  name: redcarpet
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.5.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.8
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: tilt
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -43,7 +203,23 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'meta language compiler for static web pages '
+- !ruby/object:Gem::Dependency
+  name: url2thumb
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: opinionated static web page generator
 email:
 - epynonymous@outlook.com
 executables:
@@ -97,5 +273,5 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: meta compiler (meta)
+summary: opinionated static web page generator
 test_files: []